From ced7a5fd8ecefcf59655185b7a9f2d71aafd5b38 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 4 Oct 2001 06:48:09 +0000 Subject: [PATCH] Fix #56586 2001-10-04 Havoc Pennington Fix #56586 * gtk/gtksettings.c (gtk_settings_class_init): move the F10 accelerator setting here... * gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here, because we try to use it when a menu bar hasn't necessarily been initialized. --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-0 | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ ChangeLog.pre-2-2 | 11 +++++++++++ ChangeLog.pre-2-4 | 11 +++++++++++ ChangeLog.pre-2-6 | 11 +++++++++++ ChangeLog.pre-2-8 | 11 +++++++++++ docs/reference/gtk/tmpl/gtkmenu.sgml | 6 +++--- gtk/gtkmenubar.c | 6 ------ gtk/gtksettings.c | 15 +++++++++++++-- 10 files changed, 93 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index f901bdd679..38e40e9bd1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2001-10-04 Havoc Pennington + + Fix #56586 + + * gtk/gtksettings.c (gtk_settings_class_init): move the F10 + accelerator setting here... + + * gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here, + because we try to use it when a menu bar hasn't necessarily been + initialized. + 2001-10-03 Havoc Pennington * tests/testtextbuffer.c (logical_motion_tests): fix test case, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f901bdd679..38e40e9bd1 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +2001-10-04 Havoc Pennington + + Fix #56586 + + * gtk/gtksettings.c (gtk_settings_class_init): move the F10 + accelerator setting here... + + * gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here, + because we try to use it when a menu bar hasn't necessarily been + initialized. + 2001-10-03 Havoc Pennington * tests/testtextbuffer.c (logical_motion_tests): fix test case, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f901bdd679..38e40e9bd1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +2001-10-04 Havoc Pennington + + Fix #56586 + + * gtk/gtksettings.c (gtk_settings_class_init): move the F10 + accelerator setting here... + + * gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here, + because we try to use it when a menu bar hasn't necessarily been + initialized. + 2001-10-03 Havoc Pennington * tests/testtextbuffer.c (logical_motion_tests): fix test case, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f901bdd679..38e40e9bd1 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +2001-10-04 Havoc Pennington + + Fix #56586 + + * gtk/gtksettings.c (gtk_settings_class_init): move the F10 + accelerator setting here... + + * gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here, + because we try to use it when a menu bar hasn't necessarily been + initialized. + 2001-10-03 Havoc Pennington * tests/testtextbuffer.c (logical_motion_tests): fix test case, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f901bdd679..38e40e9bd1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +2001-10-04 Havoc Pennington + + Fix #56586 + + * gtk/gtksettings.c (gtk_settings_class_init): move the F10 + accelerator setting here... + + * gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here, + because we try to use it when a menu bar hasn't necessarily been + initialized. + 2001-10-03 Havoc Pennington * tests/testtextbuffer.c (logical_motion_tests): fix test case, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f901bdd679..38e40e9bd1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +2001-10-04 Havoc Pennington + + Fix #56586 + + * gtk/gtksettings.c (gtk_settings_class_init): move the F10 + accelerator setting here... + + * gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here, + because we try to use it when a menu bar hasn't necessarily been + initialized. + 2001-10-03 Havoc Pennington * tests/testtextbuffer.c (logical_motion_tests): fix test case, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f901bdd679..38e40e9bd1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +2001-10-04 Havoc Pennington + + Fix #56586 + + * gtk/gtksettings.c (gtk_settings_class_init): move the F10 + accelerator setting here... + + * gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here, + because we try to use it when a menu bar hasn't necessarily been + initialized. + 2001-10-03 Havoc Pennington * tests/testtextbuffer.c (logical_motion_tests): fix test case, diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml index b51c366a4b..b8f6c87935 100644 --- a/docs/reference/gtk/tmpl/gtkmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkmenu.sgml @@ -96,9 +96,9 @@ Creates a new #GtkMenu. Adds a new #GtkMenuItem to the end of the menu's item list. - @menu: a #GtkMenu. @child: The #GtkMenuItem to add. + @m: @c: @@ -108,9 +108,9 @@ Adds a new #GtkMenuItem to the end of the menu's item list. Adds a new #GtkMenuItem to the beginning of the menu's item list. - @menu: a #GtkMenu. @child: The #GtkMenuItem to add. + @menu_child: @m: @c: @@ -122,10 +122,10 @@ Adds a new #GtkMenuItem to the menu's item list at the position indicated by @position. - @menu: a #GtkMenu. @child: The #GtkMenuItem to add. @pos: + @position: The position in the item list where @child is added. Positions are numbered from 0 to n-1. diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index bf2e27c7f4..d38da28962 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -142,12 +142,6 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class) "move_current", 1, GTK_TYPE_MENU_DIRECTION_TYPE, GTK_MENU_DIR_CHILD); - - gtk_settings_install_property (g_param_spec_string ("gtk-menu-bar-accel", - _("Menu bar accelerator"), - _("Keybinding to activate the menu bar"), - "F10", - G_PARAM_READWRITE)); gtk_widget_class_install_style_property (widget_class, g_param_spec_enum ("shadow_type", diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 21cd49ffc8..bd666813de 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -28,7 +28,8 @@ enum { PROP_CURSOR_BLINK_TIME, PROP_SPLIT_CURSOR, PROP_THEME_NAME, - PROP_KEY_THEME_NAME + PROP_KEY_THEME_NAME, + PROP_MENU_BAR_ACCEL }; @@ -187,7 +188,17 @@ gtk_settings_class_init (GtkSettingsClass *class) NULL, G_PARAM_READWRITE), NULL); - g_assert (result == PROP_KEY_THEME_NAME); + g_assert (result == PROP_KEY_THEME_NAME); + + result = settings_install_property_parser (class, + g_param_spec_string ("gtk-menu-bar-accel", + _("Menu bar accelerator"), + _("Keybinding to activate the menu bar"), + "F10", + G_PARAM_READWRITE), + NULL); + + g_assert (result == PROP_MENU_BAR_ACCEL); } static void -- 2.30.2